Skip to content

[RISCV] Correct the SDTypeProfile for RISCVISD::PROBED_ALLOCA #139135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
May 8, 2025
Merged

[RISCV] Correct the SDTypeProfile for RISCVISD::PROBED_ALLOCA #139135

merged 4 commits into from
May 8, 2025

Conversation

@topperc
Copy link
Collaborator

@topperc topperc commented May 8, 2025

No description provided.

@topperc topperc requested review from lenary and s-barannikov May 8, 2025 19:30
@llvmbot
Copy link
Member

llvmbot commented May 8, 2025

@llvm/pr-subscribers-backend-risc-v

Author: Craig Topper (topperc)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/139135.diff

1 Files Affected:

  • (modified) llvm/lib/Target/RISCV/RISCVInstrInfo.td (+1-2)
diff --git a/llvm/lib/Target/RISCV/RISCVInstrInfo.td b/llvm/lib/Target/RISCV/RISCVInstrInfo.td
index 4a4290483e94b..76bf3be7861c5 100644
--- a/llvm/lib/Target/RISCV/RISCVInstrInfo.td
+++ b/llvm/lib/Target/RISCV/RISCVInstrInfo.td
@@ -103,8 +103,7 @@ def riscv_add_tprel : SDNode<"RISCVISD::ADD_TPREL",
                                                   SDTCisInt<0>]>>;
 
 def riscv_probed_alloca : SDNode<"RISCVISD::PROBED_ALLOCA",
-                                 SDTypeProfile<1, 1, [SDTCisSameAs<0, 1>,
-                                                      SDTCisVT<0, i32>]>,
+                                 SDTypeProfile<0, 1, [SDTCisVT<0, XLenVT>]>,
                                  [SDNPHasChain, SDNPMayStore]>;
 
 //===----------------------------------------------------------------------===//

@topperc
Copy link
Collaborator Author

topperc commented May 8, 2025

CC: @rzinsly

@s-barannikov
Copy link
Contributor

s-barannikov commented May 8, 2025

PROBED_STACKALLOC_DYN should also be fixed, and this will require changing MI operand index in emitDynamicProbedAlloc.

s-barannikov
s-barannikov approved these changes May 8, 2025
View reviewed changes
Copy link
Contributor

@s-barannikov s-barannikov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@topperc topperc merged commit a25d38d into llvm:main May 8, 2025
9 of 10 checks passed
@topperc topperc deleted the pr/typeprofile branch May 8, 2025 23:26
@llvm-ci
Copy link
Collaborator

llvm-ci commented May 8, 2025

LLVM Buildbot has detected a new failure on builder llvm-clang-aarch64-darwin running on doug-worker-4 while building llvm at step 6 "test-build-unified-tree-check-all".

Full details are available at: https://lab.llvm.org/buildbot/#/builders/190/builds/19692

Here is the relevant piece of the build log for the reference 
Step 6 (test-build-unified-tree-check-all) failure: test (failure)
******************** TEST 'Clang-Unit :: ./AllClangUnitTests/11/48' FAILED ********************
Script(shard):
--
GTEST_OUTPUT=json:/Users/buildbot/buildbot-root/aarch64-darwin/build/tools/clang/unittests/./AllClangUnitTests-Clang-Unit-1298-11-48.json GTEST_SHUFFLE=0 GTEST_TOTAL_SHARDS=48 GTEST_SHARD_INDEX=11 /Users/buildbot/buildbot-root/aarch64-darwin/build/tools/clang/unittests/./AllClangUnitTests
--

Note: This is test shard 12 of 48.
[==========] Running 510 tests from 105 test suites.
[----------] Global test environment set-up.
[----------] 1 test from MinimizeSourceToDependencyDirectivesTest
[ RUN      ] MinimizeSourceToDependencyDirectivesTest.DefineHorizontalWhitespace
[       OK ] MinimizeSourceToDependencyDirectivesTest.DefineHorizontalWhitespace (2 ms)
[----------] 1 test from MinimizeSourceToDependencyDirectivesTest (2 ms total)

[----------] 1 test from HeaderSearchTest
[ RUN      ] HeaderSearchTest.NoSearchDir
[       OK ] HeaderSearchTest.NoSearchDir (3 ms)
[----------] 1 test from HeaderSearchTest (3 ms total)

[----------] 1 test from ModuleDeclStateTest
[ RUN      ] ModuleDeclStateTest.ModuleImplementationPartition
[       OK ] ModuleDeclStateTest.ModuleImplementationPartition (2 ms)
[----------] 1 test from ModuleDeclStateTest (2 ms total)

[----------] 1 test from DxcModeTest
[ RUN      ] DxcModeTest.TargetProfileValidation
[       OK ] DxcModeTest.TargetProfileValidation (8 ms)
[----------] 1 test from DxcModeTest (8 ms total)

[----------] 1 test from MultilibTest
[ RUN      ] MultilibTest.SetPushback
[       OK ] MultilibTest.SetPushback (0 ms)
[----------] 1 test from MultilibTest (0 ms total)

[----------] 2 tests from ExprMutationAnalyzerTest
[ RUN      ] ExprMutationAnalyzerTest.CallUnresolved
[       OK ] ExprMutationAnalyzerTest.CallUnresolved (50 ms)
[ RUN      ] ExprMutationAnalyzerTest.RangeForNonArrayByConstRef
input.cc:1:103: warning: expression result unused [-Wunused-value]
    1 | struct V { const int* begin() const; const int* end() const; };void f() { V x; for (const int& e : x) e; }
      |                                                                                                       ^
[       OK ] ExprMutationAnalyzerTest.RangeForNonArrayByConstRef (2 ms)
[----------] 2 tests from ExprMutationAnalyzerTest (53 ms total)

[----------] 1 test from MacroExpansionContextTest
[ RUN      ] MacroExpansionContextTest.StringizingVariadicMacros
[       OK ] MacroExpansionContextTest.StringizingVariadicMacros (0 ms)
[----------] 1 test from MacroExpansionContextTest (0 ms total)

[----------] 1 test from EnvironmentTest
...

@lenary
Copy link
Member

lenary commented May 9, 2025

@topperc thanks, this looks more correct than it was, definitely.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@s-barannikov s-barannikov s-barannikov approved these changes

@lenary lenary Awaiting requested review from lenary

Assignees

No one assigned

Labels

backend:RISC-V

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@topperc @llvmbot @s-barannikov @llvm-ci @lenary